auto upstream
authorJoakim Verona <joakim@verona.se>
Tue, 25 Dec 2012 23:46:27 +0000 (00:46 +0100)
committerJoakim Verona <joakim@verona.se>
Tue, 25 Dec 2012 23:46:27 +0000 (00:46 +0100)

Trivial merge